diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..16e5d75
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,51 @@
+language: cpp
+sudo: false
+matrix:
+  include:
+  - os: linux
+    sudo: required
+    dist: trusty
+    compiler: clang
+  - os: linux
+    sudo: required
+    dist: trusty
+    compiler: gcc
+#  - os: osx
+#    compiler: clang
+#  - os: osx
+#    compiler: gcc
+git:
+  depth: 5
+addons:
+  apt:
+    packages:
+    - qt5-qmake
+    - qtbase5-dev
+    - freeglut3-dev
+    - qt5-default
+before_install:
+- if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get -qq update && sudo apt-get install
+  -y qt5-qmake qtbase5-dev freeglut3-dev qt5-default; fi
+#- if [ $TRAVIS_OS_NAME == osx ]; then brew update && brew install qt4-qmake libqt4-dev; fi
+install:
+- git clone --quiet --depth 1 https://github.com/fifengine/fifengine-atlas-creator.git
+- cd src; qmake
+- make
+- sudo make install
+- cd ..
+script:
+- cd ..
+- cd src; qmake
+- ls -alh .
+- make
+- sudo make install
+notifications:
+  irc: irc.freenode.org#fife
+  email: false
+#deploy:
+#  provider: releases
+#  api_key:
+#    secure: Bi5esH9G3mPpMdDAyVXsbrvoOhHm9lf38NBI5BR85GDuBg4gE3Gm8nlprBQWhm7jXSZH9qc58MeC48B4YWqA/TjVBRqJ2n+H0dK0jLUZi4yo1kB+bDxkshZP7GtAC62wUSKF81aPY38kH3yj8AR3iUHaYUBRc54BkeWzsvJ3C1g=
+#  file: Fifengine*.tar.gz
+#  on:
+ #   repo: fifengine/fifengine
diff --git a/src/atlascreator.pro b/src/atlascreator.pro
index d26b2f3..da4804e 100644
--- a/src/atlascreator.pro
+++ b/src/atlascreator.pro
@@ -33,7 +33,7 @@ RESOURCES += resources.qrc
 
 win32:CONFIG(release, debug|release): LIBS += -L$$PWD/freeglut/lib/ -lfreeglut
 else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/freeglut/lib/ -lfreeglutd
-else:unix:!macx: LIBS += -L$$PWD/freeglut/lib/ -lfreeglut
+else:unix:!macx: LIBS += -lglut -lGLU -lGL
 
 INCLUDEPATH += $$PWD/freeglut/include
 DEPENDPATH += $$PWD/freeglut/include
diff --git a/src/glwidget.cpp b/src/glwidget.cpp
index ee13aed..96bdf40 100644
--- a/src/glwidget.cpp
+++ b/src/glwidget.cpp
@@ -26,10 +26,10 @@
 #include <QMessageBox>
 #include <QTime>
 //#include <QtOpenGL>
+#include <GL/glut.h>
+#ifdef WIN32
 #include <freeglut/include/GL/glut.h>
-//#ifdef WIN32
-//#include <gl/GLU.h>
-//#endif
+#endif
 
 const int timerInterval = 20;
 
diff --git a/src/glwidget.h b/src/glwidget.h
index 9ebe52c..36fcd8d 100644
--- a/src/glwidget.h
+++ b/src/glwidget.h
@@ -31,8 +31,8 @@ class GLWidget : public QGLWidget
 {
 	Q_OBJECT
 public:
-	GLWidget(QWidget* parent);
-	virtual ~GLWidget();
+    GLWidget(QWidget* parent);
+    virtual ~GLWidget();
 
 	void resizeGL(int width, int height);
 	void refreshed(QImage const& tex);
@@ -53,7 +53,7 @@ private slots:
 	void timerEvent(QTimerEvent* event);
 
 private:
-	float mCam_xpos;
+    float mCam_xpos;
 	float mCam_ypos;
 	float mCam_zpos;
 
diff --git a/src/main.cpp b/src/main.cpp
index 7dc839d..30925ce 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -19,7 +19,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include <QtWidgets/QApplication>
+#include <QtWidgets>
 #include "mainwindow.h"
 
 int main(int argc, char *argv[])
diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index 8e793e9..279a072 100644
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -184,7 +184,7 @@
           <x>10</x>
           <y>90</y>
           <width>341</width>
-          <height>141</height>
+          <height>162</height>
          </rect>
         </property>
         <layout class="QFormLayout" name="formLayout">
@@ -301,7 +301,7 @@
           <x>80</x>
           <y>530</y>
           <width>171</width>
-          <height>43</height>
+          <height>48</height>
          </rect>
         </property>
         <layout class="QFormLayout" name="formLayout_2">