bug fixes
Merge branch 'issue-12'