Cleaned up package definition
Merged master