Merge remote-tracking branch 'irstv/master'
Merge remote-tracking branch 'irstv/master'

This merges pull request #43.
Merge remote-tracking branch 'irstv/master'

Merges pull request #45
Merge remote-tracking branch 'irstv/master'

Merges pull request 46
Merge remote-tracking branch 'irstv/master'

Merges PR 47
Merge remote-tracking branch 'irstv/master'
Merge remote-tracking branch 'irstv/master'
Merge remote-tracking branch 'irstv/master'
Merge remote-tracking branch 'irstv/master'
Merge remote-tracking branch 'irstv/master'
Update after upstream changes.

After agouge/Java-Network-Analyzer#29, there were several changes to
make in order for the project to still build.
Merge pull request #57 from agouge/fix/upstream-changes

Fix/upstream changes

After agouge/Java-Network-Analyzer#29, there were several changes to
make in order for the project to build correctly.