Fixed a bug. Nexios - 555
Merge branch 'master' of https://github.com/nexios/nexios