clear all
Merge pull request #1 from buntarb/master

Merge branches