closed #16
Merge branch 'develop' of github.com:hhroc/traffairious into develop