Fix issues #110 and #168.
Merge pull request #216 from skystrife/master

Fix issues #110 and #168.