release candidate 2
Merge pull request #33 from Nunnery/bleeding2

release candidate 2