clean up due to merge conflicts.
Merge pull request #5 from c3isecurity/master

clean up due to merge conflicts.