Begins to get shape input working but not working...
Merge branch 'master' of github.com:ekylibre/ekylibre