Made it work again
Revert "Made it work again"

This reverts commit d8b5c1eda4142bc542826cfec7a51c7dbbdfde40.
Revert "Revert "Made it work again""

This reverts commit fe3a8d3ff8f44013c6630d0fb43c26f97bbff4c2.
Revert "Revert "Revert "Made it work again"""

This reverts commit 8fe8e6b5cbd1603bbb89dc07552384e555b42087.
Merge branch 'master' of https://github.com/mihahren/structure.git