Closes #71
Merge pull request #72 from jpav/master

Closes #71
Closes #69
Merge pull request #73 from jpav/master

Closes #69
Closes #68
Merge pull request #74 from jpav/master

Closes #68
Closes #75
Merge pull request #76 from jpav/master

Closes #75