Fixed some bugs.
Merge branch 'master' of http://github.com/nebree8/nebree8