trying to make things work again
Merge pull request #1 from thunder-/develop

trying to make things work again