Fixed issue #13

Fixing issue #13. Compiled against master branch.