Added a makefile to resolve issue-#3
Merge branch 'admin/ISSUE-3' into development