Modifications
Merge branch 'master' of github.com:ytham/capitalmap
Final changes