gh-10 Solved name conflict for shortcodes.
Merge pull request #13 from No3x/master

gh-10 Solved name conflict for shortcodes.