initial work from orta
Merge pull request #1 from orta/master

@joe => initial design work from orta