Started implementing software packages according to issue #45
Fixed issue #40