Fixes issues #22, #49, #56