[master 7:29PM 10/3/2013]

- Fixed some bugs