Merge pull request #145 from taitems/develop

Merge changes and fixes from develop branch