Prototyping and testing
Merge pull request #1 from cschu/master

Prototyping and testing