Fix conflict with master branch.
Merge pull request #12 from powerist/working

Fix conflict with master branch.