#11 and #12 fix
Merge pull request #13 from TjRus/0.5.4

#11 and #12 fix