Merge pull request #1 from Flowdalic/master

Merge Flowdalic/Smack