Merge pull request #60 from guywithnose/master

other
hack some bugs