fixed merge conflcist in master page
Merge pull request #98 from andeic/issue79

Nice