Merge pull request #12 from Janward/master

prototype system