commit some important fixes

temporary commit
Merge branch 'issue-#5'