Merge pull request #60 from MarkTonkinson/master

stuffs
have to
done
Merge pull request #61 from kweek/master

have to