#42 issue fixed 2/2
Merge pull request #77 from cassiopaia/master

#42 issue fixed 2/2