Revert "Merge pull request #1 from maseek/master"