Created new branch issue21

--HG--
branch : issue21
proposed fix for #21

--HG--
branch : jsosic/proposed-fix-for-21-1410729144233
Merged jsosic/proposed-fix-for-21-1410729144233 into issue21

--HG--
branch : issue21
Close branch issue21

--HG--
branch : issue21
extra : close : True
Merged in issue21 (pull request #27)

fix for #21