fixed jordan's bug
Merge branch 'master' of github.com:tkaruzis/Loon