pausing again
Merge pull request #58 from WClement/master

pausing again
Merge pull request #59 from ii-BLACKREAPER/master

stuff
stuff