fixed more commit and merge issues
Merge pull request #2 from dlipskey/dev

fixed more commit and merge issues