Done Issue#26
Merge branch 'iss26_fixed'