Merge pull request #45 from linuxuser27/support2017