Fixed LP 1121062; fixed LP 1121057
.
Fixed LP 1121055.
Merge pull request #72 from snwh/devel

Fixed LP 1121062; fixed LP 1121057, fixed LP 1121055.