Merge branch 'master' of https://github.com/vividdream/stockodin
Merge branch 'master' into Colin