Merge pull request #1 from turambar/master

Initial commits
Merge pull request #2 from turambar/master

Added TIWAL CAL stuff
removed extraneous stuff