Fixed #22;
Merge branch 'issue-22' into development