Merge pull request #19 from SvenDowideit/pre-0.12.0

Pre 0.12.0