Merge pull request #2 from doogi2014/master

non fixes#1