merged master
Merge pull request #1 from VividCortex/improvements

Improvements