Merge of Ghost-Sailor's master project

This could help me a little so I will try it.