Merge pull request #4 from brian978/develop

Added improvements