Fix #64 & #71

https://github.com/cho2/simaya/commit/d6bbbc5c1adb32157cf7dca1b5cd19213cc7b581