31052014-1

Bug fixes - #4, #5, #28