Fix for issues #13 #14

credits @mmontagnana for fix