Testing pagoda
Merge pull request #76 from pajcho/development

Testing pagoda