Ach issue29

Issue #29 fixed. Please check the code and perform the merging...