Merge pull request #1 from inspiran/master

Added docs and tests
add .gitignore and clean up a bit
Merge pull request #2 from cordoval/master

add .gitignore and clean up a bit
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore