Merge pull request #1 from ComSSA/master

update from upstream
>mewlines
Merge pull request #6 from delan/master

>mewlines