Merge pull request #12 from arocketman/remaing_features

used MAX_PICS constant instead of '500'
Reformatting and refactoring the code
.