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

This reverts commit d277c2be2c5646ca4ae5bf77ef9766eabb6db6ab.