Merge pull request #18 from Nunnery/bleeding

Bleeding
Merge pull request #19 from Nunnery/bleeding

upping version for future development
Merge master with bleeding
fixing some deprecated constructors