Various fixes
Merge pull request #1 from secynic/0.1.2

Various fixes