4 branch merge master

- this pull request contains the #4 issue fixes as well as fixes the conflicts with the master