Revert "Revert "Merge pull request #59 from lechup/master""

This reverts commit 4d748e753873d22b696fc0f3bd7b3b6454e922ad.