packages fixed, round 2 problem I solution
Merge pull request #3 from SergeyWeiss/master

packages fixed, round 2 problem I solution