close #14
Merge branch 'master' into issue_14
Merge pull request #15 from coilen/issue_14

Issue 14