Refactoring and fixed assembly information
Merge branch 'master' of https://github.com/StevenFrost/Projectile.git