new loader added
merge conflict resolved
Merge pull request #35 from rishy/master

new loader added