Issue#1

Addressed Issue#1